fix deprecated-copy waring. (#675)

This fixes
"formatload.cc:127:40: warning: implicitly-declared
 ‘Format& Format::operator=(const Format&)’ is deprecated [-Wdeprecated-copy]"

Use default member initializers for FormatOption and Format classes.
This allows the use of the default constructor and simplifies the
creation of parameterized constructors.

Use implicit copy constructor for FormatOption and Format classes.
Note the previous copy constructor for the Format class was not
really a copy constructor, it re-initialized readUseCount and writeUseCount.
This was unnecessary.  The only place we want to use the copy constructor is
in FormatLoad::getFormats and the instances to be copied have just been
created with one of the Format constructors so the use counts will be zero.
There are plenty of other opportunities where Qt might detach formatList_
and use the copy constructor.  Most of these cases are read accesses and
improved const correctness could eliminate the possiblity, i.e. using
QList::at instead of QList::operator[].  A few of these are modifying an
item on the formatList_, and Qt will insist the copy constructor is available
at compile time even if it is never used at run time.

diff --git a/gui/format.h b/gui/format.h
index 0a2786495898d783b9556fd0e3492ec273c7b97f..4da1d5428c23496f027210428858e588fff757cb 100644 (file)
--- a/gui/format.h
+++ b/gui/format.h
@@ -41,12 +41,7 @@ public:
     OPToutFile,
   } optionType;
 
-  FormatOption(): name_(QString()), description_(QString()), type_(OPTbool),
-    defaultValue_(QVariant()),
-    minValue_(QVariant()), maxValue_(QVariant()),
-    html_(QString()), value_(QVariant()), isSelected_(false)
-  {
-  }
+  FormatOption() = default;
   FormatOption(const QString& name,
                const QString& description,
                optionType type,
@@ -54,26 +49,24 @@ public:
                QVariant minValue = QVariant(),
                QVariant maxValue = QVariant(),
                QString html = QString()
-              ): name_(name), description_(description), type_(type),
-    defaultValue_(defaultValue), minValue_(minValue), maxValue_(maxValue), html_(html)
+              ):
+    name_(name),
+    description_(description),
+    type_(type),
+    defaultValue_(defaultValue),
+    minValue_(minValue),
+    maxValue_(maxValue),
+    html_(html)
   {
-    value_ = QVariant();
     // Boolean values pay more attention to 'selected' than value.  Make
     // them match here. For non-bools, just make them unchecked.
-    if (type_ == OPTbool && defaultValue.toBool() == true) {
+    if ((type_ == OPTbool) && defaultValue_.toBool()) {
       isSelected_ = true;
     } else {
       isSelected_ = false;
     }
   }
 
-  FormatOption(const FormatOption& c)
-    : name_(c.name_), description_(c.description_), type_(c.type_),
-      defaultValue_(c.defaultValue_), minValue_(c.minValue_), maxValue_(c.maxValue_), html_(c.html_),
-      value_(c.value_), isSelected_(c.isSelected_)
-  {
-  }
-
   QString  getName() const
   {
     return name_;
@@ -125,13 +118,13 @@ public:
 private:
   QString name_;
   QString description_;
-  optionType type_;
+  optionType type_{OPTbool};
   QVariant defaultValue_;
   QVariant minValue_;
   QVariant maxValue_;
   QString  html_;
   QVariant value_;
-  bool     isSelected_;
+  bool isSelected_{false};
 };
 
 
@@ -139,67 +132,39 @@ private:
 class Format
 {
 public:
-  Format():name_(QString()),
-    description_(QString()),
-    readWaypoints_(false),
-    readTracks_(false),
-    readRoutes_(false),
-    writeWaypoints_(false),
-    writeTracks_(false),
-    writeRoutes_(false),
-    fileFormat_(false),
-    deviceFormat_(false),
-    hidden_(false),
-    extensions_(QStringList()),
-    html_(QString()),
-    readUseCount_(0),
-    writeUseCount_(0)
-  {
-    inputOptions_.clear();
-    outputOptions_.clear();
-  }
-
+  Format() = default;
   Format(const QString& name,
          const QString& description,
-         bool readWaypoints, bool readTracks, bool readRoutes,
-         bool writeWaypoints, bool writeTracks, bool writeRoutes,
-         bool fileFormat, bool deviceFormat,
+         bool readWaypoints,
+         bool readTracks,
+         bool readRoutes,
+         bool writeWaypoints,
+         bool writeTracks,
+         bool writeRoutes,
+         bool fileFormat,
+         bool deviceFormat,
          const QStringList& extensions,
          QList<FormatOption>& inputOptions,
          QList<FormatOption>& outputOptions,
          const QString& html):
-    name_(name), description_(description),
-    readWaypoints_(readWaypoints), readTracks_(readTracks), readRoutes_(readRoutes),
-    writeWaypoints_(writeWaypoints), writeTracks_(writeTracks), writeRoutes_(writeRoutes),
-    fileFormat_(fileFormat), deviceFormat_(deviceFormat),
+    name_(name),
+    description_(description),
+    readWaypoints_(readWaypoints),
+    readTracks_(readTracks),
+    readRoutes_(readRoutes),
+    writeWaypoints_(writeWaypoints),
+    writeTracks_(writeTracks),
+    writeRoutes_(writeRoutes),
+    fileFormat_(fileFormat),
+    deviceFormat_(deviceFormat),
     hidden_(false),
     extensions_(extensions),
     inputOptions_(inputOptions),
-    outputOptions_(outputOptions),
-    html_(QString()),
-    readUseCount_(0),
-    writeUseCount_(0)
+    outputOptions_(outputOptions)
   {
     (void)html; // suppress 'unused' warning.
   }
 
-  Format(const Format& c):
-    name_(c.name_), description_(c.description_),
-    readWaypoints_(c.readWaypoints_), readTracks_(c.readTracks_), readRoutes_(c.readRoutes_),
-    writeWaypoints_(c.writeWaypoints_), writeTracks_(c.writeTracks_), writeRoutes_(c.writeRoutes_),
-    fileFormat_(c.fileFormat_), deviceFormat_(c.deviceFormat_),
-    hidden_(false),
-    extensions_(c.extensions_),
-    inputOptions_(c.inputOptions_),
-    outputOptions_(c.outputOptions_),
-    html_(c.html_),
-    readUseCount_(0),
-    writeUseCount_(0)
-  {
-  }
-
-  ~Format() {}
-
   bool isReadWaypoints() const
   {
     return readWaypoints_;
@@ -335,17 +300,24 @@ public:
   }
 
 private:
-  QString name_, description_;
-  bool readWaypoints_, readTracks_, readRoutes_;
-  bool writeWaypoints_, writeTracks_, writeRoutes_;
-  bool fileFormat_, deviceFormat_, hidden_;
+  QString name_;
+  QString description_;
+  bool readWaypoints_{false};
+  bool readTracks_{false};
+  bool readRoutes_{false};
+  bool writeWaypoints_{false};
+  bool writeTracks_{false};
+  bool writeRoutes_{false};
+  bool fileFormat_{false};
+  bool deviceFormat_{false};
+  bool hidden_{false};
   QStringList extensions_;
   QList<FormatOption>inputOptions_;
   QList<FormatOption>outputOptions_;
   QString html_;
   static QString htmlBase_;
-  int      readUseCount_;
-  int      writeUseCount_;
+  int readUseCount_{0};
+  int writeUseCount_{0};
 
 };